bitkeeper revision 1.280 (3f093a5fKV8EQACD3ywz56MWKkwBQA)

A couple of very minor bug fixes.

diff --git a/tools/internal/Makefile b/tools/internal/Makefile
index 8611e297cb094e9741d582d2281fcc825b712610..6015becf3b48c8997c3f335add1be96932ac2442 100644 (file)
--- a/tools/internal/Makefile
+++ b/tools/internal/Makefile
@@ -58,5 +58,5 @@ rpm: all
        rm -rf staging
 
 clean:
-       $(RM) *.o *.rpm $(XI_CREATE) $(XI_START) $(XI_STOP) $(XI_DESTROY) $(XI_BUILD) $(XI_PHYSDEV_GRANT)
+       $(RM) *.o *.rpm $(XI_CREATE) $(XI_START) $(XI_STOP) $(XI_DESTROY) $(XI_BUILD) $(XI_PHYS_GRANT) $(XI_PHYS_REVOKE) $(XI_PHYS_PROBE)
 

diff --git a/xen/drivers/block/xen_physdisk.c b/xen/drivers/block/xen_physdisk.c
index 8e94e3c32fae6de484f8290cebf2af1bc6682168..e0d697bd663e4b25cec56612c532a63fe4eea03b 100644 (file)
--- a/xen/drivers/block/xen_physdisk.c
+++ b/xen/drivers/block/xen_physdisk.c
@@ -111,7 +111,7 @@ static void xen_physdisk_revoke_access(unsigned short dev,
       /* Cut the current ace down to just the bit before the kzone,
         create a new ace for the bit just after it. */ 
       new_ace = kmalloc(sizeof(*cur_ace), GFP_KERNEL);
-      new_ace->device = dev;
+      new_ace->device = dev & ~0x1f;
       new_ace->start_sect = kill_zone_end;
       new_ace->n_sectors = ace_end - kill_zone_end;
       new_ace->mode = cur_ace->mode;